Update a11y test output

diff --git a/testsuite/a11y/about.txt b/testsuite/a11y/about.txt
index 4d7917e97c751d11ad822724e29ec858c65218ed..60b62068c32ab8d3f425b3d69f09f93880de1ee3 100644 (file)
--- a/testsuite/a11y/about.txt
+++ b/testsuite/a11y/about.txt
@@ -8,104 +8,6 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  headerbar1
-    "panel"
-    parent: window1
-    index: 1
-    state: enabled sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
-    stack_switcher
-      "filler"
-      parent: headerbar1
-      index: 0
-      state: enabled horizontal sensitive
-      toolkit: gtk
-      <AtkComponent>
-      layer: widget
-      alpha: 1
-      unnamed-GtkRadioButtonAccessible-0
-        "radio button"
-        parent: stack_switcher
-        index: 0
-        name: About
-        member-of: unnamed-GtkRadioButtonAccessible-1
-                   unnamed-GtkRadioButtonAccessible-2
-                   unnamed-GtkRadioButtonAccessible-3
-                   unnamed-GtkRadioButtonAccessible-0
-        state: checked enabled focusable sensitive visible
-        toolkit: gtk
-        <AtkComponent>
-        layer: widget
-        alpha: 1
-        <AtkImage>
-        image size: -1 x -1
-        image description: (null)
-        <AtkAction>
-        action 0 name: click
-        action 0 description: Clicks the button
-      unnamed-GtkRadioButtonAccessible-3
-        "radio button"
-        parent: stack_switcher
-        index: 1
-        name: Credits
-        member-of: unnamed-GtkRadioButtonAccessible-1
-                   unnamed-GtkRadioButtonAccessible-2
-                   unnamed-GtkRadioButtonAccessible-3
-                   unnamed-GtkRadioButtonAccessible-0
-        state: enabled focusable sensitive
-        toolkit: gtk
-        <AtkComponent>
-        layer: widget
-        alpha: 1
-        <AtkImage>
-        image size: -1 x -1
-        image description: (null)
-        <AtkAction>
-        action 0 name: click
-        action 0 description: Clicks the button
-      unnamed-GtkRadioButtonAccessible-2
-        "radio button"
-        parent: stack_switcher
-        index: 2
-        name: License
-        member-of: unnamed-GtkRadioButtonAccessible-1
-                   unnamed-GtkRadioButtonAccessible-2
-                   unnamed-GtkRadioButtonAccessible-3
-                   unnamed-GtkRadioButtonAccessible-0
-        state: enabled focusable sensitive
-        toolkit: gtk
-        <AtkComponent>
-        layer: widget
-        alpha: 1
-        <AtkImage>
-        image size: -1 x -1
-        image description: (null)
-        <AtkAction>
-        action 0 name: click
-        action 0 description: Clicks the button
-      unnamed-GtkRadioButtonAccessible-1
-        "radio button"
-        parent: stack_switcher
-        index: 3
-        name: System
-        member-of: unnamed-GtkRadioButtonAccessible-1
-                   unnamed-GtkRadioButtonAccessible-2
-                   unnamed-GtkRadioButtonAccessible-3
-                   unnamed-GtkRadioButtonAccessible-0
-        state: enabled focusable sensitive
-        toolkit: gtk
-        <AtkComponent>
-        layer: widget
-        alpha: 1
-        <AtkImage>
-        image size: -1 x -1
-        image description: (null)
-        <AtkAction>
-        action 0 name: click
-        action 0 description: Clicks the button
   dialog-vbox1
     "filler"
     parent: window1
@@ -319,7 +221,7 @@ window1
               start index: 0
               end index: 7
               anchors: http://www.gtk.org
-            unnamed-GtkLabelAccessibleLinkImpl-4
+            unnamed-GtkLabelAccessibleLinkImpl-0
               "link"
               parent: website_label
               state: enabled focusable focused multi-line sensitive showing visible
@@ -414,7 +316,7 @@ See the GNU General Public License, version 3 or later for details.
               start index: 56
               end index: 102
               anchors: http://www.gnu.org/licenses/gpl-3.0.html
-            unnamed-GtkLabelAccessibleLinkImpl-5
+            unnamed-GtkLabelAccessibleLinkImpl-1
               "link"
               parent: license_label
               state: enabled focusable focused multi-line sensitive showing visible
@@ -441,3 +343,101 @@ See the GNU General Public License, version 3 or later for details.
         <AtkComponent>
         layer: widget
         alpha: 1
+  headerbar1
+    "panel"
+    parent: window1
+    index: 1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
+    stack_switcher
+      "filler"
+      parent: headerbar1
+      index: 0
+      state: enabled horizontal sensitive
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      unnamed-GtkRadioButtonAccessible-2
+        "radio button"
+        parent: stack_switcher
+        index: 0
+        name: About
+        member-of: unnamed-GtkRadioButtonAccessible-3
+                   unnamed-GtkRadioButtonAccessible-4
+                   unnamed-GtkRadioButtonAccessible-5
+                   unnamed-GtkRadioButtonAccessible-2
+        state: checked enabled focusable sensitive visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkImage>
+        image size: -1 x -1
+        image description: (null)
+        <AtkAction>
+        action 0 name: click
+        action 0 description: Clicks the button
+      unnamed-GtkRadioButtonAccessible-5
+        "radio button"
+        parent: stack_switcher
+        index: 1
+        name: Credits
+        member-of: unnamed-GtkRadioButtonAccessible-3
+                   unnamed-GtkRadioButtonAccessible-4
+                   unnamed-GtkRadioButtonAccessible-5
+                   unnamed-GtkRadioButtonAccessible-2
+        state: enabled focusable sensitive
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkImage>
+        image size: -1 x -1
+        image description: (null)
+        <AtkAction>
+        action 0 name: click
+        action 0 description: Clicks the button
+      unnamed-GtkRadioButtonAccessible-4
+        "radio button"
+        parent: stack_switcher
+        index: 2
+        name: License
+        member-of: unnamed-GtkRadioButtonAccessible-3
+                   unnamed-GtkRadioButtonAccessible-4
+                   unnamed-GtkRadioButtonAccessible-5
+                   unnamed-GtkRadioButtonAccessible-2
+        state: enabled focusable sensitive
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkImage>
+        image size: -1 x -1
+        image description: (null)
+        <AtkAction>
+        action 0 name: click
+        action 0 description: Clicks the button
+      unnamed-GtkRadioButtonAccessible-3
+        "radio button"
+        parent: stack_switcher
+        index: 3
+        name: System
+        member-of: unnamed-GtkRadioButtonAccessible-3
+                   unnamed-GtkRadioButtonAccessible-4
+                   unnamed-GtkRadioButtonAccessible-5
+                   unnamed-GtkRadioButtonAccessible-2
+        state: enabled focusable sensitive
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkImage>
+        image size: -1 x -1
+        image description: (null)
+        <AtkAction>
+        action 0 name: click
+        action 0 description: Clicks the button

diff --git a/testsuite/a11y/actionbar.txt b/testsuite/a11y/actionbar.txt
index e72b2ca90d40035392116f19aaac00ade301f248..3f5900377c9e14591e8c7e2f9809de335e240337 100644 (file)
--- a/testsuite/a11y/actionbar.txt
+++ b/testsuite/a11y/actionbar.txt
@@ -50,8 +50,7 @@ window1
       action 0 description: Clicks the button
     button5
       "push button"
-      parent: unnamed-GtkContainerAccessible-0
-      index: 2
+      parent: unnamed-GtkWidgetAccessible-1
       name: Center
       state: enabled focusable sensitive showing visible
       toolkit: gtk
@@ -64,11 +63,11 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the button
-    button4
+    button3
       "push button"
-      parent: unnamed-GtkContainerAccessible-0
-      index: 3
-      name: End 2
+      parent: unnamed-GtkContainerAccessible-2
+      index: 1
+      name: End 1
       state: enabled focusable sensitive showing visible
       toolkit: gtk
       <AtkComponent>
@@ -80,11 +79,11 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the button
-    button3
+    button4
       "push button"
-      parent: unnamed-GtkContainerAccessible-0
-      index: 4
-      name: End 1
+      parent: unnamed-GtkContainerAccessible-2
+      index: 0
+      name: End 2
       state: enabled focusable sensitive showing visible
       toolkit: gtk
       <AtkComponent>

diff --git a/testsuite/a11y/colorchooser.txt b/testsuite/a11y/colorchooser.txt
index 3986054027136748d489c0ff4e68c49cb1bd6087..1282061f94aae520533c763e98016369f495abdf 100644 (file)
--- a/testsuite/a11y/colorchooser.txt
+++ b/testsuite/a11y/colorchooser.txt
@@ -8,49 +8,6 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  headerbar
-    "panel"
-    parent: window1
-    index: 1
-    state: enabled sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
-    cancel_button
-      "push button"
-      parent: headerbar
-      index: 0
-      name: Cancel
-      state: enabled focusable sensitive showing visible
-      toolkit: gtk
-      <AtkComponent>
-      layer: widget
-      alpha: 1
-      <AtkImage>
-      image size: -1 x -1
-      image description: (null)
-      <AtkAction>
-      action 0 name: click
-      action 0 description: Clicks the button
-      action 0 keybinding: <Alt>c
-    ok_button
-      "push button"
-      parent: headerbar
-      index: 1
-      name: Select
-      state: enabled focusable sensitive showing visible default
-      toolkit: gtk
-      <AtkComponent>
-      layer: widget
-      alpha: 1
-      <AtkImage>
-      image size: -1 x -1
-      image description: (null)
-      <AtkAction>
-      action 0 name: click
-      action 0 description: Clicks the button
-      action 0 keybinding: <Alt>s
   dialog-vbox1
     "filler"
     parent: window1
@@ -1323,3 +1280,46 @@ window1
         <AtkComponent>
         layer: widget
         alpha: 1
+  headerbar
+    "panel"
+    parent: window1
+    index: 1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
+    cancel_button
+      "push button"
+      parent: headerbar
+      index: 0
+      name: Cancel
+      state: enabled focusable sensitive showing visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      <AtkImage>
+      image size: -1 x -1
+      image description: (null)
+      <AtkAction>
+      action 0 name: click
+      action 0 description: Clicks the button
+      action 0 keybinding: <Alt>c
+    ok_button
+      "push button"
+      parent: headerbar
+      index: 1
+      name: Select
+      state: enabled focusable sensitive showing visible default
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      <AtkImage>
+      image size: -1 x -1
+      image description: (null)
+      <AtkAction>
+      action 0 name: click
+      action 0 description: Clicks the button
+      action 0 keybinding: <Alt>s

diff --git a/testsuite/a11y/expander.txt b/testsuite/a11y/expander.txt
index 1eb96f1a78683889ed1a33a31e690e25bfad6e55..c2837f41dbf2d2b3208ae5b91962594392dcc505 100644 (file)
--- a/testsuite/a11y/expander.txt
+++ b/testsuite/a11y/expander.txt
@@ -20,43 +20,3 @@ window1
     <AtkAction>
     action 0 name: activate
     action 0 description: Activates the expander
-    label1
-      "label"
-      parent: expander1
-      index: 0
-      name: Hello World!
-      state: enabled multi-line sensitive visible
-      toolkit: gtk
-      <AtkComponent>
-      layer: widget
-      alpha: 1
-      <AtkText>
-      text: Hello World!
-      character count: 12
-      caret offset: 0
-      default attributes: bg-color: <omitted>
-                          bg-full-height: 0
-                          direction: <omitted>
-                          editable: false
-                          family-name: <omitted>
-                          fg-color: <omitted>
-                          indent: 0
-                          invisible: false
-                          justification: left
-                          language: <omitted>
-                          left-margin: 0
-                          pixels-above-lines: 0
-                          pixels-below-lines: 0
-                          pixels-inside-wrap: 0
-                          right-margin: 0
-                          rise: 0
-                          scale: 1
-                          size: <omitted>
-                          stretch: <omitted>
-                          strikethrough: false
-                          style: <omitted>
-                          underline: none
-                          variant: <omitted>
-                          weight: <omitted>
-                          wrap-mode: word
-      <AtkHypertext>

diff --git a/testsuite/a11y/menubutton2.txt b/testsuite/a11y/menubutton2.txt
index f71a5a20d5c84c820bd0f6fe0d705206d4f8c6cd..0102a8829387cf94cfbf23de75fcd43f1c8e3a65 100644 (file)
--- a/testsuite/a11y/menubutton2.txt
+++ b/testsuite/a11y/menubutton2.txt
@@ -15,22 +15,6 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-  menubutton
-    "toggle button"
-    parent: window1
-    index: 0
-    name: Menu
-    state: enabled focusable sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
-    <AtkImage>
-    image size: 16 x 16
-    image description: (null)
-    <AtkAction>
-    action 0 name: click
-    action 0 description: Clicks the button
   unnamed-GtkPopoverAccessible-1
     "panel"
     parent: menubutton
@@ -101,3 +85,19 @@ window1
                 <AtkAction>
                 action 0 name: click
                 action 0 description: Clicks the button
+  menubutton
+    "toggle button"
+    parent: window1
+    index: 0
+    name: Menu
+    state: enabled focusable sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
+    <AtkImage>
+    image size: 16 x 16
+    image description: (null)
+    <AtkAction>
+    action 0 name: click
+    action 0 description: Clicks the button

diff --git a/testsuite/a11y/menubutton3.txt b/testsuite/a11y/menubutton3.txt
index f71a5a20d5c84c820bd0f6fe0d705206d4f8c6cd..0102a8829387cf94cfbf23de75fcd43f1c8e3a65 100644 (file)
--- a/testsuite/a11y/menubutton3.txt
+++ b/testsuite/a11y/menubutton3.txt
@@ -15,22 +15,6 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-  menubutton
-    "toggle button"
-    parent: window1
-    index: 0
-    name: Menu
-    state: enabled focusable sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
-    <AtkImage>
-    image size: 16 x 16
-    image description: (null)
-    <AtkAction>
-    action 0 name: click
-    action 0 description: Clicks the button
   unnamed-GtkPopoverAccessible-1
     "panel"
     parent: menubutton
@@ -101,3 +85,19 @@ window1
                 <AtkAction>
                 action 0 name: click
                 action 0 description: Clicks the button
+  menubutton
+    "toggle button"
+    parent: window1
+    index: 0
+    name: Menu
+    state: enabled focusable sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
+    <AtkImage>
+    image size: 16 x 16
+    image description: (null)
+    <AtkAction>
+    action 0 name: click
+    action 0 description: Clicks the button

diff --git a/testsuite/a11y/pickers.txt b/testsuite/a11y/pickers.txt
index 2f25f927d0bad5643797c6aca588aa989fe209f4..e8164482a6bdfe45e4fde487f68e4988b9c20cc6 100644 (file)
--- a/testsuite/a11y/pickers.txt
+++ b/testsuite/a11y/pickers.txt
@@ -20,7 +20,7 @@ window1
       "unknown"
       parent: grid1
       index: 0
-      state: enabled sensitive visible
+      state: enabled sensitive showing visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
@@ -29,7 +29,7 @@ window1
       "unknown"
       parent: grid1
       index: 1
-      state: enabled sensitive visible
+      state: enabled sensitive showing visible
       toolkit: gtk
       <AtkComponent>
       layer: widget